removed some unnecessary files
added some structure
merging branches
removed a file