Removed all additional levels
Replaced all absolute imports with relative