cleaned up directory, working on specs