reworked the file structure
updated TODO