File restructure and packages renamed