Code Rearranging

Moved some files to another location to improve code maintainability