NOE

- huge cleaing in main file + creating components of base