structure

added a file structure and moved some stuff around