Changed files structure, changed setup.py