Reorganization of directory structure to fit maven standards.