updated filestructure and making this project workable