organized files better, three structures under module