Re organized files a bit