Massive changes to structure and Refactoring done