The "folder mess" is actually a good way of keeping things ordered - I think PSR-4 is a return to the "include_path" chaos