Cleaned up files/structure