Cleaned up file structure and fixed some configs with logging