Organized Structure

Refactored and added UI features