New structure for 0.8.4

New structure for 0.8.4