Code Rearranging

Moved some files to another location to improve code maintainability
Merge pull request #1 from Panz3r/culo

Code Rearranging