Moved files into more organized set up