Fixed file namespaces / references
- Fixed all warnings