File restructure + implementation of module system