composer use psr-4 autoload and move files
fix some formatting