Changed directory structure and implemented numSpec unit tests