Restructure files
Use rdoc