Moved spec to psr-0 structure