Restructure folders, and modifications for psr-2 compliance