Update read me, rename files for better architecture