Reorganize and optimize many things, no need 'dev' folder anymore