reformat
restructure with src folder