Switch to PSR4
Remake for better code completion, add enums