moved source to an appropriate package within the project