Restructured Slightly (Put into src folder)

/Shouldnt/ break anything