Updated structure, cleaned out old files