removed extra files, made a modular structure