Directory structure cleanup. Removed /trunk/current and /trunk/src in preparation for new src tree (0.3 branch)