more cleaning
added modular files