Moved source folders to make it easier to import packages into eclipse