Removed unused function
moved files out of their folder to the root
Merge branch 'develop'