solved minor bugs.
refactored.
just moved files around