Refactor structure and removed unnessary files, changed views path