Updated Project Structure to increase understandability