Refactored to psr-0
Changed file structure