cleaned up old comments
rearranged file structure