Restructure and initial skeleton modules setup