Rejiggered folder structure, added specs