Removed all bundles
Added submodules instead of bad links, refactored folder setup to work better with home folder