Refactor directories, run code through psr formatter
PSR formatting