Removed warnings and refactored file locations