Restructuralize files and folders

Hey guys, please if you have some time do some code review and let me know I will merge this PR