Flatter file structure and updated library files