B1 & B2 Assignments

Cleaning up file structure.