Organized files and added depencies