Moved files to src/ folder
Finised reformatting