Refactorize after D8 Beta has been released. Follow D8 standards.. PSR-4..