reorganize source files into src/ subdirectory
cross off temp variables from TODO