Moved around methods and folders
o.o