Version 0.3.3 - Reorganized structure