Major rewrite with src and dist folders