Reorganize files.. things starting to come together