Moved files outside of src/main