reorganize files, prepare for angular