Starting to clean the project up a little...