Re-structured application and updated README