Add AMD wrapper where needed
Better files structure