Probably you are right that forking the code is not such a good idea. Perhaps as I get used to the ACS way of doing things the code will seem less messy.
However, and this my be ACS/pg's goal also, I have a greater interest in having a stable production quality system then staying current with the latest ACS version.
