PEP-8 compilance

Moved some modules etc. pp. and renamed methods, functions and classes to provide PEP-8 compilance