Moved standalone files to be slightly more seperate