Added necessary dependencies, reformatted directories to work with existing structure and fixed build errors