cleaned up files/structure