reorganized paths and added pythonpath