changed/cleaned up file structure