removed old files + some small changes. Still not working with virtualenv