Updated all the files

Now everything's much more organizes and flows better