Changed the file layout

+Just moving around the files