change upon requests

refactored files. one more to go