cleaned up structure
added resources