major changes

restructured almost everything :)