Restructured everything, now the home dir is cleaner :)