Better file structure;
Introduced some constants;