Organization + fixing

I fixed some stuff with changing from eclips to Intellij. Need a fix for
proxies.