Fixed code convention
Paths moved to config