Updated to better file structure