Re-arrange Repo + some minor changes