Master branch updated with new file structure