Cleaned up all the file stucture and implemented users and roles