changed package names to lower case
continued refactor by updating imports
Removed some test files
Merge branch 'developer' into developer-subrequirement